settings: Make not subclassable

Part of being more explicit about what
we allow to be subclassed and what not.

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 43d067a7af5ecd11212fedf6ba21a258abf1e8cb..e14818f5c7bfe3ad64abb1d2ac8c4ae01c2f07aa 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -100,6 +100,17 @@
 #define DEFAULT_TIMEOUT_REPEAT   50
 #define DEFAULT_TIMEOUT_EXPAND  500
 
+struct _GtkSettingsClass
+{
+  GObjectClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
 typedef struct _GtkSettingsPropertyValue GtkSettingsPropertyValue;
 typedef struct _GtkSettingsValuePrivate GtkSettingsValuePrivate;
 

diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 9b1b41d93deced13e37056038a8c367bba8bf72c..dbf007c1d4216a293ee24256f827168dd43fbf7a 100644 (file)
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -31,10 +31,7 @@ G_BEGIN_DECLS
 /* -- type macros --- */
 #define GTK_TYPE_SETTINGS             (gtk_settings_get_type ())
 #define GTK_SETTINGS(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SETTINGS, GtkSettings))
-#define GTK_SETTINGS_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SETTINGS, GtkSettingsClass))
 #define GTK_IS_SETTINGS(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SETTINGS))
-#define GTK_IS_SETTINGS_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SETTINGS))
-#define GTK_SETTINGS_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SETTINGS, GtkSettingsClass))
 
 
 /* --- typedefs --- */
@@ -52,17 +49,6 @@ struct _GtkSettings
   GtkSettingsPrivate *priv;
 };
 
-struct _GtkSettingsClass
-{
-  GObjectClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
 /**
  * GtkSettingsValue:
  * @origin: Origin should be something like “filename:linenumber” for